projects
/
project
/
libubox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
13a9b7c
)
utils.h: fix name collisions in __u_bswap16 with using "val" both inside the macro...
author
Felix Fietkau
<
[email protected]
>
Thu, 24 Oct 2013 09:33:22 +0000
(11:33 +0200)
committer
Felix Fietkau
<
[email protected]
>
Thu, 24 Oct 2013 09:33:23 +0000
(11:33 +0200)
Reported-by: Markus Stenberg <
[email protected]
>
Signed-off-by: Felix Fietkau <
[email protected]
>
utils.h
patch
|
blob
|
history
diff --git
a/utils.h
b/utils.h
index db6217ed849b53de35e5b8419e7ba89afc579795..8d4e8100498a549b4bf1fa2dd7882d78d13dbbde 100644
(file)
--- a/
utils.h
+++ b/
utils.h
@@
-100,7
+100,10
@@
void clock_gettime(int type, struct timespec *tv);
#define __LITTLE_ENDIAN LITTLE_ENDIAN
#endif
-#define __u_bswap16(x) ({ uint16_t val = (x); ((uint16_t)(((val >> 8) & 0xffu) | ((val & 0xffu) << 8))); })
+static inline uint16_t __u_bswap16(uint16_t val)
+{
+ return ((val >> 8) & 0xffu) | ((val & 0xffu) << 8);
+}
#if _GNUC_MIN_VER(4, 2)
#define __u_bswap32(x) __builtin_bswap32(x)